Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 20:31:25 +0000 (13:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 20:31:25 +0000 (13:31 -0700)
commita762ea1d58580343eb045039bc426ccd59d61599
treec30a8c3d9006415691449fdd8e6a154f28c17b6f
parent96f1e61015615eef4fce55e7a4b1019e8e215efc
parent7d68ef54e0d77759c379dc82c6fcff3d7c4cb85c
Merge from trunk.